From 8acd16de1e1835630a3ef996ab75ea63391e9846 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Wed, 16 Mar 1994 22:44:00 +0000 Subject: [PATCH] (read_minibuf): Disallow trailing junk. --- src/minibuf.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/minibuf.c b/src/minibuf.c index 384c85f4c55..c3209e6f933 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -293,7 +293,17 @@ read_minibuf (map, initial, prompt, backup_n, expflag, histvar, histpos) /* If Lisp form desired instead of string, parse it. */ if (expflag) - val = Fread (val); + { + Lisp_Object expr_and_pos; + unsigned char *p; + + expr_and_pos = Fread_from_string (val, Qnil, Qnil); + /* Ignore trailing whitespace; any other trailing junk is an error. */ + for (p = XSTRING (val)->data + XINT (Fcdr (expr_and_pos)); *p; p++) + if (*p != ' ' && *p != '\t' && *p != '\n') + error ("Trailing garbage following expression"); + val = Fcar (expr_and_pos); + } unbind_to (count, Qnil); /* The appropriate frame will get selected in set-window-configuration. */ -- 2.30.2